Manual merge.
authorsmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>
Tue, 2 Aug 2005 11:35:45 +0000 (11:35 +0000)
committersmh22@firebug.cl.cam.ac.uk <smh22@firebug.cl.cam.ac.uk>
Tue, 2 Aug 2005 11:35:45 +0000 (11:35 +0000)

Trivial merge